From: Ray Strode <rstrode@redhat.com>
Date: Sun, 28 Jul 2013 20:15:43 +0000 (-0400)
Subject: authPrompt: don't muck with cancelButton in onAskQuestion
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3790
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=58ca6ec6aa8706dc8f3ef47b3ead55b303578838;p=gnome-shell.git

authPrompt: don't muck with cancelButton in onAskQuestion

onAskQuestion has this code:

    if (this.verifyingUser)
        this.cancelButton.show();
    else
        this.cancelButton.hide();

but onAskQuestion can only be called when this.verifyingUser is true.
Also, cancelButton is public, and it only ever otherwise gets hidden
from callers.

This commit drops mucking with cancelButton visibility, leaving it
entirely up to the callers to deal with.

https://bugzilla.gnome.org/show_bug.cgi?id=683437
---

diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 07a92b771..b84e949eb 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -203,11 +203,6 @@ const AuthPrompt = new Lang.Class({
         this.setPasswordChar(passwordChar);
         this.setQuestion(question);
 
-        if (this.verifyingUser)
-            this.cancelButton.show();
-        else
-            this.cancelButton.hide();
-
         if (passwordChar) {
             if (this._userVerifier.reauthenticating)
                 this.nextButton.label = _("Unlock");